diff options
| author | Jeremy Allison <jra@samba.org> | 2009-11-30 15:53:04 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-11-30 15:53:04 -0800 |
| commit | 8303bc49a45d5bab0cdbd4f2d793088f600f715f (patch) | |
| tree | de386a449efb20c1cbb4fc3a62a6e6bb588d4810 /source3/modules/vfs_readahead.c | |
| parent | b852a3494aa3af3d69175f68669609b23fefc1bb (diff) | |
| download | samba-8303bc49a45d5bab0cdbd4f2d793088f600f715f.tar.gz samba-8303bc49a45d5bab0cdbd4f2d793088f600f715f.tar.xz samba-8303bc49a45d5bab0cdbd4f2d793088f600f715f.zip | |
Restructure the connect function code to always call
down to NEXT-> before initializing. This allows us to
do cleanup (by calling DISCONNECT) if initialization
fails. Also fix vfs_acl_xattr which was failing to
call the NEXT connect function.
Jeremy.
Diffstat (limited to 'source3/modules/vfs_readahead.c')
| -rw-r--r-- | source3/modules/vfs_readahead.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/source3/modules/vfs_readahead.c b/source3/modules/vfs_readahead.c index 124230811dd..e7a7dd305cc 100644 --- a/source3/modules/vfs_readahead.c +++ b/source3/modules/vfs_readahead.c @@ -127,8 +127,15 @@ static int readahead_connect(struct vfs_handle_struct *handle, const char *service, const char *user) { - struct readahead_data *rhd = SMB_MALLOC_P(struct readahead_data); + struct readahead_data *rhd; + int ret = SMB_VFS_NEXT_CONNECT(handle, service, user); + + if (ret < 0) { + return ret; + } + rhd = SMB_MALLOC_P(struct readahead_data); if (!rhd) { + SMB_VFS_NEXT_DISCONNECT(handle); DEBUG(0,("readahead_connect: out of memory\n")); return -1; } @@ -152,7 +159,7 @@ static int readahead_connect(struct vfs_handle_struct *handle, handle->data = (void *)rhd; handle->free_data = free_readahead_data; - return SMB_VFS_NEXT_CONNECT(handle, service, user); + return 0; } static struct vfs_fn_pointers vfs_readahead_fns = { |