Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[karo-tx-linux.git] / fs / cifs / cifsfs.c

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 061a1dca987dc0d888dd2c9d8a15d602bd14a31a..13ea53251dcf934518889696e7222286c13aefde 100644 (file)
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -347,7 +347,6 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m)
        if (cifs_sb) {
                tcon = cifs_sb->tcon;
                if (tcon) {
-/* BB add prepath to mount options displayed */
                        seq_printf(s, ",unc=%s", cifs_sb->tcon->treeName);
                        if (tcon->ses) {
                                if (tcon->ses->userName)
@@ -362,12 +361,12 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m)
                                        switch (server->addr.sockAddr6.
                                                sin6_family) {
                                        case AF_INET6:
-                                               seq_printf(s, NIP6_FMT,
-                                                          NIP6(server->addr.sockAddr6.sin6_addr));
+                                               seq_printf(s, "%pI6",
+                                                          &server->addr.sockAddr6.sin6_addr);
                                                break;
                                        case AF_INET:
-                                               seq_printf(s, NIPQUAD_FMT,
-                                                          NIPQUAD(server->addr.sockAddr.sin_addr.s_addr));
+                                               seq_printf(s, "%pI4",
+                                                          &server->addr.sockAddr.sin_addr.s_addr);
                                                break;
                                        }
                                }
@@ -439,9 +438,8 @@ int cifs_xquota_set(struct super_block *sb, int quota_type, qid_t qid,
        xid = GetXid();
        if (pTcon) {
                cFYI(1, ("set type: 0x%x id: %d", quota_type, qid));
-       } else {
+       } else
                rc = -EIO;
-       }
 
        FreeXid(xid);
        return rc;
@@ -463,9 +461,8 @@ int cifs_xquota_get(struct super_block *sb, int quota_type, qid_t qid,
        xid = GetXid();
        if (pTcon) {
                cFYI(1, ("set type: 0x%x id: %d", quota_type, qid));
-       } else {
+       } else
                rc = -EIO;
-       }
 
        FreeXid(xid);
        return rc;
@@ -486,9 +483,8 @@ int cifs_xstate_set(struct super_block *sb, unsigned int flags, int operation)
        xid = GetXid();
        if (pTcon) {
                cFYI(1, ("flags: 0x%x operation: 0x%x", flags, operation));
-       } else {
+       } else
                rc = -EIO;
-       }
 
        FreeXid(xid);
        return rc;
@@ -501,17 +497,16 @@ int cifs_xstate_get(struct super_block *sb, struct fs_quota_stat *qstats)
        struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
        struct cifsTconInfo *pTcon;
 
-       if (cifs_sb) {
+       if (cifs_sb)
                pTcon = cifs_sb->tcon;
-       } else {
+       else
                return -EIO;
-       }
+
        xid = GetXid();
        if (pTcon) {
                cFYI(1, ("pqstats %p", qstats));
-       } else {
+       } else
                rc = -EIO;
-       }
 
        FreeXid(xid);
        return rc;
@@ -752,7 +747,6 @@ const struct file_operations cifs_file_ops = {
 #endif /* CONFIG_CIFS_POSIX */
 
 #ifdef CONFIG_CIFS_EXPERIMENTAL
-       .dir_notify = cifs_dir_notify,
        .setlease = cifs_setlease,
 #endif /* CONFIG_CIFS_EXPERIMENTAL */
 };
@@ -773,7 +767,6 @@ const struct file_operations cifs_file_direct_ops = {
 #endif /* CONFIG_CIFS_POSIX */
        .llseek = cifs_llseek,
 #ifdef CONFIG_CIFS_EXPERIMENTAL
-       .dir_notify = cifs_dir_notify,
        .setlease = cifs_setlease,
 #endif /* CONFIG_CIFS_EXPERIMENTAL */
 };
@@ -794,7 +787,6 @@ const struct file_operations cifs_file_nobrl_ops = {
 #endif /* CONFIG_CIFS_POSIX */
 
 #ifdef CONFIG_CIFS_EXPERIMENTAL
-       .dir_notify = cifs_dir_notify,
        .setlease = cifs_setlease,
 #endif /* CONFIG_CIFS_EXPERIMENTAL */
 };
@@ -814,7 +806,6 @@ const struct file_operations cifs_file_direct_nobrl_ops = {
 #endif /* CONFIG_CIFS_POSIX */
        .llseek = cifs_llseek,
 #ifdef CONFIG_CIFS_EXPERIMENTAL
-       .dir_notify = cifs_dir_notify,
        .setlease = cifs_setlease,
 #endif /* CONFIG_CIFS_EXPERIMENTAL */
 };
@@ -823,9 +814,6 @@ const struct file_operations cifs_dir_ops = {
        .readdir = cifs_readdir,
        .release = cifs_closedir,
        .read    = generic_read_dir,
-#ifdef CONFIG_CIFS_EXPERIMENTAL
-       .dir_notify = cifs_dir_notify,
-#endif /* CONFIG_CIFS_EXPERIMENTAL */
        .unlocked_ioctl  = cifs_ioctl,
        .llseek = generic_file_llseek,
 };