aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-13 15:10:16 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-13 15:10:16 -0700
commit0fdfe5ad2802e747460bf48eb2eb0ca3d3f3af42 (patch)
tree1358c7920438e090605695f6fb8e7989eb3f8998 /include
parent44d2d371d250b44cbe40f8d47e329c97668d7594 (diff)
parent0df5dd4aae211edeeeb84f7f84f6d093406d7c22 (diff)
downloadmrst-s0i3-test-0fdfe5ad2802e747460bf48eb2eb0ca3d3f3af42.tar.gz
mrst-s0i3-test-0fdfe5ad2802e747460bf48eb2eb0ca3d3f3af42.tar.xz
mrst-s0i3-test-0fdfe5ad2802e747460bf48eb2eb0ca3d3f3af42.zip
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: NFSv4: fix delegated locking NFS: Ensure that the WRITE and COMMIT RPC calls are always uninterruptible NFS: Fix a race with the new commit code NFS: Ensure that writeback_single_inode() calls write_inode() when syncing NFS: Fix the mode calculation in nfs_find_open_context NFSv4: Fall back to ordinary lookup if nfs4_atomic_open() returns EISDIR
Diffstat (limited to 'include')
-rw-r--r--include/linux/nfs_fs_sb.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index 717a5e54eb1..e82957acea5 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -176,6 +176,7 @@ struct nfs_server {
#define NFS_CAP_ATIME (1U << 11)
#define NFS_CAP_CTIME (1U << 12)
#define NFS_CAP_MTIME (1U << 13)
+#define NFS_CAP_POSIX_LOCK (1U << 14)
/* maximum number of slots to use */