diff options
author | Michael Adam <obnox@samba.org> | 2008-01-11 13:41:46 +0100 |
---|---|---|
committer | Michael Adam <obnox@samba.org> | 2008-04-21 00:21:24 +0200 |
commit | 74ed53a115b2063d4d5c8572af8f1302bc658882 (patch) | |
tree | 3e4691767849feb4f3d07affcb3328632e33906b /source/locking | |
parent | d928e6648d61cf2d3c1b77db440efb835b729a84 (diff) | |
download | samba-74ed53a115b2063d4d5c8572af8f1302bc658882.tar.gz samba-74ed53a115b2063d4d5c8572af8f1302bc658882.tar.xz samba-74ed53a115b2063d4d5c8572af8f1302bc658882.zip |
Slight reformatting of fd_close_posix(), while I'm at it.
Wrap lines and remove trailing space.
Michael
Diffstat (limited to 'source/locking')
-rw-r--r-- | source/locking/posix.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/source/locking/posix.c b/source/locking/posix.c index aedc12dedea..32e1ee9fbfd 100644 --- a/source/locking/posix.c +++ b/source/locking/posix.c @@ -614,7 +614,9 @@ int fd_close_posix(struct files_struct *fsp) int *fd_array = NULL; size_t count, i; - if (!lp_locking(fsp->conn->params) || !lp_posix_locking(fsp->conn->params)) { + if (!lp_locking(fsp->conn->params) || + !lp_posix_locking(fsp->conn->params)) + { /* * No locking or POSIX to worry about or we want POSIX semantics * which will lose all locks on all fd's open on this dev/inode, @@ -626,8 +628,9 @@ int fd_close_posix(struct files_struct *fsp) if (get_windows_lock_ref_count(fsp)) { /* - * There are outstanding locks on this dev/inode pair on other fds. - * Add our fd to the pending close tdb and set fsp->fh->fd to -1. + * There are outstanding locks on this dev/inode pair on + * other fds. Add our fd to the pending close tdb and set + * fsp->fh->fd to -1. */ add_fd_to_close_entry(fsp); @@ -642,7 +645,8 @@ int fd_close_posix(struct files_struct *fsp) count = get_posix_pending_close_entries(talloc_tos(), fsp, &fd_array); if (count) { - DEBUG(10,("fd_close_posix: doing close on %u fd's.\n", (unsigned int)count )); + DEBUG(10,("fd_close_posix: doing close on %u fd's.\n", + (unsigned int)count)); for(i = 0; i < count; i++) { if (close(fd_array[i]) == -1) { @@ -672,7 +676,7 @@ int fd_close_posix(struct files_struct *fsp) if (ret == 0 && saved_errno != 0) { errno = saved_errno; ret = -1; - } + } return ret; } |