Trond Myklebust e89e896d31 Merge branch 'devel' into next ...

Conflicts:

	fs/nfs/file.c

Fix up the conflict with Jon Corbet's bkl-removal tree

2008-07-15 18:34:16 -04:00

..

callback_proc.c

nfs: replace remaining __FUNCTION__ occurrences

2008-05-16 09:43:29 -07:00

callback_xdr.c

nfs: replace remaining __FUNCTION__ occurrences

2008-05-16 09:43:29 -07:00

callback.c

nfs4: fix potential race with rapid nfs_callback_up/down cycle

2008-07-09 12:09:32 -04:00

callback.h

…

client.c

NFS: set transport defaults after mount option parsing is finished

2008-07-09 12:09:38 -04:00

delegation.c

nfs: replace remaining __FUNCTION__ occurrences

2008-05-16 09:43:29 -07:00

delegation.h

…

dir.c

NFS: Use NFSDBG_FILE for all fops

2008-07-09 12:09:04 -04:00

direct.c

NFS: Use NFSDBG_FILE for all fops

2008-07-09 12:09:04 -04:00

file.c

Merge branch 'devel' into next

2008-07-15 18:34:16 -04:00

getroot.c

…

idmap.c

…

inode.c

NFS: Ensure we zap only the access and acl caches when setting new acls

2008-07-09 12:09:19 -04:00

internal.h

NFS: Ensure we zap only the access and acl caches when setting new acls

2008-07-09 12:09:19 -04:00

iostat.h

NFS: Fix a warning in nfs4_async_handle_error

2008-07-09 12:09:18 -04:00

Makefile

NFS: Always enable NFS direct I/O

2008-03-19 18:00:34 -04:00

mount_clnt.c

NFS: Fix filehandle size comparisons in the mount code

2008-06-23 17:09:06 -04:00

namespace.c

nfs: path_{get,put}() cleanups

2008-05-16 09:43:30 -07:00

nfs2xdr.c

nfs: return negative error value from nfs{,4}_stat_to_errno

2008-04-19 16:54:47 -04:00

nfs3acl.c

NFS: Ensure we zap only the access and acl caches when setting new acls

2008-07-09 12:09:19 -04:00

nfs3proc.c

NFS: Remove the redundant file_open entry from struct nfs_rpc_ops

2008-07-09 12:09:16 -04:00

nfs3xdr.c

nfs: return negative error value from nfs{,4}_stat_to_errno

2008-04-19 16:54:47 -04:00

nfs4_fs.h

nfs: make nfs4_drop_state_owner() static

2008-05-16 09:43:31 -07:00

nfs4namespace.c

nfs: replace remaining __FUNCTION__ occurrences

2008-05-16 09:43:29 -07:00

nfs4proc.c

nfs: initialize timeout variable in nfs4_proc_setclientid_confirm

2008-07-09 12:09:30 -04:00

nfs4renewd.c

nfs: replace remaining __FUNCTION__ occurrences

2008-05-16 09:43:29 -07:00

nfs4state.c

nfs: make nfs4_drop_state_owner() static

2008-05-16 09:43:31 -07:00

nfs4xdr.c

nfs: replace remaining __FUNCTION__ occurrences

2008-05-16 09:43:29 -07:00

nfsroot.c

NFS: use documenting macro constants for initializing ac{reg, dir}{min, max}

2008-07-09 12:09:40 -04:00

pagelist.c

…

proc.c

NFS: Remove the redundant file_open entry from struct nfs_rpc_ops

2008-07-09 12:09:16 -04:00

read.c

nfs: replace remaining __FUNCTION__ occurrences

2008-05-16 09:43:29 -07:00

super.c

NFS: Allow either strict or sloppy mount option parsing

2008-07-09 12:09:44 -04:00

symlink.c

nfs: remove unnecessary NFS_NEED_* defines

2008-04-23 16:13:37 -04:00

sysctl.c

…

unlink.c

SUNRPC: Add a helper rpcauth_lookup_generic_cred()

2008-03-14 13:42:49 -04:00

write.c

NFS: Allow redirtying of a completed unstable write.

2008-07-09 12:09:24 -04:00