Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

[cascardo/linux.git] / fs / cifs / cifsfs.c

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index e739950..cbc0f4b 100644 (file)
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -454,6 +454,10 @@ cifs_show_options(struct seq_file *s, struct dentry *root)
                seq_puts(s, ",nocase");
        if (tcon->retry)
                seq_puts(s, ",hard");
+       if (tcon->use_persistent)
+               seq_puts(s, ",persistenthandles");
+       else if (tcon->use_resilient)
+               seq_puts(s, ",resilienthandles");
        if (tcon->unix_ext)
                seq_puts(s, ",unix");
        else
@@ -921,9 +925,7 @@ const struct file_operations cifs_file_ops = {
        .mmap  = cifs_file_mmap,
        .splice_read = generic_file_splice_read,
        .llseek = cifs_llseek,
-#ifdef CONFIG_CIFS_POSIX
        .unlocked_ioctl = cifs_ioctl,
-#endif /* CONFIG_CIFS_POSIX */
        .setlease = cifs_setlease,
        .fallocate = cifs_fallocate,
 };
@@ -939,9 +941,7 @@ const struct file_operations cifs_file_strict_ops = {
        .mmap = cifs_file_strict_mmap,
        .splice_read = generic_file_splice_read,
        .llseek = cifs_llseek,
-#ifdef CONFIG_CIFS_POSIX
        .unlocked_ioctl = cifs_ioctl,
-#endif /* CONFIG_CIFS_POSIX */
        .setlease = cifs_setlease,
        .fallocate = cifs_fallocate,
 };
@@ -957,9 +957,7 @@ const struct file_operations cifs_file_direct_ops = {
        .flush = cifs_flush,
        .mmap = cifs_file_mmap,
        .splice_read = generic_file_splice_read,
-#ifdef CONFIG_CIFS_POSIX
        .unlocked_ioctl  = cifs_ioctl,
-#endif /* CONFIG_CIFS_POSIX */
        .llseek = cifs_llseek,
        .setlease = cifs_setlease,
        .fallocate = cifs_fallocate,
@@ -975,9 +973,7 @@ const struct file_operations cifs_file_nobrl_ops = {
        .mmap  = cifs_file_mmap,
        .splice_read = generic_file_splice_read,
        .llseek = cifs_llseek,
-#ifdef CONFIG_CIFS_POSIX
        .unlocked_ioctl = cifs_ioctl,
-#endif /* CONFIG_CIFS_POSIX */
        .setlease = cifs_setlease,
        .fallocate = cifs_fallocate,
 };
@@ -992,9 +988,7 @@ const struct file_operations cifs_file_strict_nobrl_ops = {
        .mmap = cifs_file_strict_mmap,
        .splice_read = generic_file_splice_read,
        .llseek = cifs_llseek,
-#ifdef CONFIG_CIFS_POSIX
        .unlocked_ioctl = cifs_ioctl,
-#endif /* CONFIG_CIFS_POSIX */
        .setlease = cifs_setlease,
        .fallocate = cifs_fallocate,
 };
@@ -1009,9 +1003,7 @@ const struct file_operations cifs_file_direct_nobrl_ops = {
        .flush = cifs_flush,
        .mmap = cifs_file_mmap,
        .splice_read = generic_file_splice_read,
-#ifdef CONFIG_CIFS_POSIX
        .unlocked_ioctl  = cifs_ioctl,
-#endif /* CONFIG_CIFS_POSIX */
        .llseek = cifs_llseek,
        .setlease = cifs_setlease,
        .fallocate = cifs_fallocate,